Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Fix buggy xhamster integration (NSFW) - #972

Merged
jsha merged 2 commits into
EFForg:masterfrom
fuzzyroddis:xhamster
Feb 17, 2015
Merged

jsha merged 2 commits into
EFForg:masterfrom
fuzzyroddis:xhamster

Conversation

@fuzzyroddis

Copy link
Copy Markdown
Contributor

Given it's a top100 site I want to let this fix stay in master a little bit before moving to stable.

The Github issue describes the fix. (exclusion on crossdomain.xml)

Fixes #970

@jsha jsha changed the title Fixes Github issue https://github.com/EFForg/https-everywhere/issues/970 Fix buggy xhamster integration (NSFW) Jan 26, 2015
@fuzzyroddis

Copy link
Copy Markdown
Contributor Author

Should be good to go.

jsha added a commit that referenced this pull request Feb 17, 2015
Fix buggy xhamster integration (NSFW)
@jsha
jsha merged commit eac82e4 into EFForg:master Feb 17, 2015
@fuzzyroddis
fuzzyroddis deleted the xhamster branch February 18, 2015 03:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

xhamster.com

3 participants